Auto merge of #1344 - lfairy:dehyphenator, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 24 Feb 2015 17:36:11 +0000 (17:36 +0000)
committerbors <bors@rust-lang.org>
Tue, 24 Feb 2015 17:36:11 +0000 (17:36 +0000)
Closes #1342.


Trivial merge